dgit.raspbian.org Git - samba.git/log

Merge version 2:4.22.10+dfsg-0+deb13u1+rpi1 and 2:4.22.10+dfsg-0+deb13u2 to produce 2:4.22.10+dfsg-0+deb13u2+rpi1

Merge samba (2:4.22.10+dfsg-0+deb13u2) import into refs/heads/workingbranch

July 2026 samba security fixes for v4.22

Origin: upstream, https://bugzilla.samba.org/show_bug.cgi?id=16039
Forwarded: not-needed

From ea7530366da502e0a116467e4565304603eba5b1 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 29 May 2026 12:43:13 +0200
Subject: [PATCH 01/23] CVE-2026-6949: ndr_dns: let ndr_pull_dns_res_rec()
remember the start offset

In order to verify TSIG signatures we need a reliable way to
truncate the original dns_name_packet buffer before the
last additional dns_res_rec.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=16083

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Douglas Bagnall <dbagnall@samba.org>
Gbp-Pq: Name 2026-jul-sec-update-bug-16039-v4-22-combined.patch

replace: use __xpg_strerror_r if available

Forwarded: no

In order to avoid linking libreplace, use __xpg_strerror_r
instead of rep_strerror_r

Gbp-Pq: Name replace-xpg-strerror.patch

ctdb: use /run/ctdb instead of /var/run/ctdb

Forwarded: not-needed

Whole upstream path assignment needs a review.

Gbp-Pq: Name ctdb-use-run-instead-of-var-run.patch

print meaningful error message if python3-markdown is not installed

Updated: Mon, 08 Apr 2024 14:14:38 +0300
Debian-Specific: yes
Forwarded: not-needed

Gbp-Pq: Name meaningful-error-if-no-python3-markdown.patch

print meaningful error message if samba-ad-provision is not installed

Updated: Thu, 03 Aug 2023 17:06:24 +0300
Debian-Specific: yes
Forwarded: not-needed

Gbp-Pq: Name meaningful-error-if-no-samba-ad-provision.patch

move msg.sock from /var/lib/samba to /run/samba

Move socket directory from /var/lib/samba to /run/samba,
exactly like msg.lock. This directory is only used by various
samba components to communicate with each other (smbcontrol),
there's no place for it in /var/lib.

Also remove msg.sock subdir in various tests.

It'd be nice to also move ntp socket and similar somewhere to
/run/samba too, but this is a bit more difficult since it is
used in other software.

https://lists.samba.org/archive/samba-technical/2022-April/137322.html

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Gbp-Pq: Name move-msg.sock-from-var-lib-samba-to-run-samba.patch

disable setuid configure checks

Forwarded: not-needed

For some strange reason, when running reprotest test on salsa-ci,
which apparently is running as root, - on the *second* build only
the configure fails (after successfully built package the first
time). The configure test tries to change gid and verifies it
actually changed (not that the syscall exist), - and that fails.
Since it is extremely uncommon to configure the build process as
root, salsa-ci test environment details are quite deep down the line,
and we know the syscall actually works, just disable the probe,
pretending we are not root.

For upstream, this probably should be done by removing a *lot* of
configure-time checks which are useless these days.

Gbp-Pq: Name disable-setuid-confchecks.patch

silence uselib_local warning produced by waf

During config/build process in verbose mode, waf produces
about 2k repetitions of this warning:

compat: "uselib_local" is deprecated, replace by "use"

which clutters the build log.

Comment this warning out for now until it will be
fixed properly.

Gbp-Pq: Name silence-waf-uselib_local.diff

create ctdb pid directory

(which is /run/ctdb/). Create it in the systemd service
file (using RuntimeDirectory directive) and in the sysv-init
script.

Gbp-Pq: Name ctdb-create-piddir.patch

fix pathname for ctdb_etcd_lock

Forwarded: not-needed

Specify the actual installation path for this helper script.

This is a quick hack, this issue should be addressed
upstream in a more generic way.

Gbp-Pq: Name ctdb_etcd_lock-path.patch

use bzero() instead of memset_s()

lib/replace/replace.h header defines ZERO_STRUCT macro
which uses memset_s() function (which is similar to
memset() but can not be optimized out by the compiler).
Glibc has bzero() with similar property, while memset_s()
have is implemented in lib/replace/replace.c, - this way,
some binaries needlessly link with libreplace-samba4 just
to get rep_memset_s() symbol. By using bzero() instead,
this endless linkage is eliminated, so we can package,
for example, libldb (which uses ZERO_STRUCT) without it
linking to libreplace-samba4.

Note: actually using explicit_bzero() so it is not optimized
out by the compiler - this is the original goal of using
memset_s().

Gbp-Pq: Name use-bzero-instead-of-memset_s.diff

ctdb-config: enable syslog by default

Bug-Debian: https://bugs.debian.org/929931
Bug-Ubuntu: https://bugs.launchpad.net/bugs/722201
Last-Update: 2022-03-24
Forwarded: not-needed

CTDB uses /var/log/ctdb/ directory for the default log files. With
syslog disabled, systemd journal is not able to correctly inform
errors happening during service initialization.

Upstream community creates generic config files to be used by different
distributions, so this change makes no big difference to be accepted by
upstream.

With this patch the end user will be able to identify initialization
errors by executing:

systemctl status ctdb.service

or to follow ctdb logs by executing:

journalctl -f -u ctdb

Signed-off-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com>
Gbp-Pq: Name ctdb-config-enable-syslog-by-default.patch

fix nfs related service names

Upstream defines nfs related service names based on the Linux
distribution. This patch fixes the names for Debian and derivatives.

Update by Andreas Hasenack <andreas@canonical.com> (LP: #1961840):
Use nfsconf(8) if it's available, instead of parsing the old config
files in /etc/default/nfs-*

Bug-Debian: https://bugs.debian.org/929931
Bug-Ubuntu: https://bugs.launchpad.net/bugs/722201
Last-Update: 2024-07-30

Gbp-Pq: Name fix-nfs-service-name-to-nfs-kernel-server.patch

drop "replace" dependency from libldb

Forwarded: not-needed

When building as a sub-library within samba, where
libreplace is a private library, libldb.so will
have rpath pointing to the private samba dir. Since
ldb actually does not use anything from libreplace,
just remove the dependency.

Gbp-Pq: Name ldb-no-replace.diff

Add so version number to private libraries for dpkg-shlibdeps

We also want dpkg-shlibdeps to generate correct dependency information
for the private libraries in our binary packages, but dpkg-shlibdeps
only works when the library has a version number.

Origin: vendor
Forwarded: not-needed

Gbp-Pq: Name add-so-version-to-private-libraries

Patch in symbol table from rfc3454, for Heimdal scripts

Forwarded: not-needed

Status: cherry-picked from heimdal package

Gbp-Pq: Name heimdal-rfc3454.txt

Enable net usershares by default at build time

Enable net usershares by default at build time, with a limit of 100, and update
the corresponding documentation.

Bug-Debian: http://bugs.debian.org/443230
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/samba/+bug/128548
Forwarded: not-needed

Gbp-Pq: Name usershare.patch

Use the pager alternative as pager is PAGER is undefined

Bug-Debian: http://bugs.debian.org/135603
Forwarded: not-needed

Gbp-Pq: Name smbclient-pager.patch

Mention smbldap-tools package in examples/LDAP/README

Bug-Debian: http://bugs.debian.org/341934
Forwarded: not-needed

Gbp-Pq: Name README_nosmbldap-tools.patch

hurd compatibility changes

Hurd does not define PIPE_BUF, so lib/tevent/testsuite.c fails to compile
(yes, this file is used as part of *samba* testsuite, not tevent testsuite).
Define it to a safe minimal value like 512 bytes.

Hurd does not provide SA_NOCLDWAIT define, so lib/util/tests/tfork.c does
not compile. This is only needed during testing to omit zombie process
generation, which has only cosmetic effect. Define it to be 0.

Based on prior work and ideas by Samuel Thibault.

Gbp-Pq: Name hurd-compat.patch

Provide public symbol tdb_logging_function removed upstream without major version change. (bug #511011)

Status: Not forwarded upstream

Gbp-Pq: Name tdb_logging_func.diff

force tdb to be standalone

Forwarded: not-needed

Upstream ships contents of lib/tdb/ as a separate
source of tdb. Since we build samba anyway, there's
no need to have separate tdb source package, it's
enough to build it during samba build.

Always build tdb as stand-alone library
(instead of being samba-private if in a subdir).

When building as a sub-library within samba,
where libreplace is a private library, libtdb.so
will have rpath pointing to the private samba
dir. Since tdb actually does not use anything
from libreplace, just remove the dependency.

Gbp-Pq: Name tdb-standalone.diff

force tevent to be standalone

Forwarded: not-needed

Upstream ships contents of lib/tevent/ as a separate
source of tevent. Since we build samba anyway, there's
no need to have separate tevent source package, it's
enough to build it during samba build.

Always build tevent as stand-alone library
(instead of being samba-private if in a subdir).

When building as a sub-library within samba, where
libreplace is a private library, libtevent.so will
have rpath pointing to the private samba dir. Since
tevent actually does not use anything from libreplace,
just remove the dependency.

Gbp-Pq: Name tevent-standalone.diff

force talloc to be standalone

Forwarded: not-needed

Upstream ships contents of lib/talloc/ as a separate
source of talloc. Since we build samba anyway, there's
no need to have separate talloc source package, it's
enough to build it during samba build.

Always build talloc as stand-alone library
(instead of being samba-private if in a subdir).

When building as a sub-library within samba, where
libreplace is a private library, libtalloc.so will
have rpath pointing to the private samba dir. Since
talloc actually does not use anything from libreplace,
just remove the dependency.

Gbp-Pq: Name talloc-standalone.diff

ensure libsmbclient.h is being used with LFS enabled

Bug-Debian: https://bugs.debian.org/221618
Forwarded: not-needed

We build samba with LFS (Large File Support) even on 32bits.
This means some types like off_t are 64-bit wide, again,
even on a 32bit host.  libsmbclient.h uses off_t in function
prototypes, and thes prototypes muct match those which were
used at samba compile time - if some other source includes
libsmbclient.h without LFS, it'll get wrong prototypes and
the resulting binary will most likely crash when using
libsmbclient functions.

Detect and error-out this at compile time.

We can not do anything with this in the public header since
it is alredy too late to redefine things, since we can't
guarantee we're the first header a program #includes, and
at the time this libsmbclient.h is included, off_t can
already be defined so our (re)define of _FILE_OFFSET_BITS
does nothing already.

Patching libsmbclient.h to use off64_t means client program
should change their off_t to off64_t too when storing
file offsets returning from libsmbclient, so this is not
an option too.

With this change, we will error out even if the user source
does not use any off_t-related functions. Namely, it was ok
to #include <libsmbclient.h> and use smbc_open/smbc_read/
smbc_write/smbc_close without _F_O_B=64, - neither of these
functions uses off_t. smbc_lseek and others doesn't work,
but if a program does not use them anyway, whole thing will
just work even without enabling LFS.  Ideally we can probably
check each individual function which is being affected, by
replacing it with #error if sizeof(off_t) < 8.  But this
requires quite some hackery...

Gbp-Pq: Name libsmbclient-ensure-lfs-221618.patch

samba (2:4.22.10+dfsg-0+deb13u2) trixie-security; urgency=medium

  * 2026-jul-sec-update-bug-16039-v4-22-combined.patch:
    Jul-2026 samba security update addresses the following defects:

    CVE-2026-6949: https://bugzilla.samba.org/show_bug.cgi?id=16083
      TSIG packet with crafted name compression can crash internal DNS server

    CVE-2026-58224: https://bugzilla.samba.org/show_bug.cgi?id=16085
      CTDB: heap OOB read via unchecked packet length fields

    CVE-2026-58216: https://bugzilla.samba.org/show_bug.cgi?id=16087
      kpasswd service: 6-byte heap OOB read in packet parser

    CVE-2026-58218: https://bugzilla.samba.org/show_bug.cgi?id=16115
      DNS TKEY negotiation stores unauthenticated GSS contexts
      in a fixed FIFO before authentication completes

    CVE-2026-58221: https://bugzilla.samba.org/show_bug.cgi?id=16147
      authenticated LDAP access to internal LDB special DNs
      permits domain takeover

    CVE-2026-58222: https://bugzilla.samba.org/show_bug.cgi?id=16148
      LDAP Compare filter injection and trusted-request
      confusion disclose protected attributes

[dgit import unpatched samba 2:4.22.10+dfsg-0+deb13u2]

Import samba_4.22.10+dfsg-0+deb13u2.debian.tar.xz

[dgit import tarball samba 2:4.22.10+dfsg-0+deb13u2 samba_4.22.10+dfsg-0+deb13u2.debian.tar.xz]

Merge version 2:4.22.8+dfsg-0+deb13u2+rpi1 and 2:4.22.10+dfsg-0+deb13u1 to produce 2:4.22.10+dfsg-0+deb13u1+rpi1

Merge version 2:4.22.8+dfsg-0+deb13u1+rpi1 and 2:4.22.8+dfsg-0+deb13u2 to produce 2:4.22.8+dfsg-0+deb13u2+rpi1

Merge samba (2:4.22.10+dfsg-0+deb13u1) import into refs/heads/workingbranch

Import samba_4.22.10+dfsg.orig.tar.xz

[dgit import orig samba_4.22.10+dfsg.orig.tar.xz]